Set cell data unconditionally. (#152562, Federico Mena Quintero)

2004-10-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_button_press): Set cell data
	unconditionally.  (#152562, Federico Mena Quintero)

diff --git a/ChangeLog b/ChangeLog
index 67d3d1440543653f4338adba463bc2a7148d6711..c0bdf56cb5745db5d257cda2df63ca520a51d026 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Set cell data
+       unconditionally.  (#152562, Federico Mena Quintero)
+
 2004-10-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkuimanager.c (update_node): Also update smart separators 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 67d3d1440543653f4338adba463bc2a7148d6711..c0bdf56cb5745db5d257cda2df63ca520a51d026 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Set cell data
+       unconditionally.  (#152562, Federico Mena Quintero)
+
 2004-10-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkuimanager.c (update_node): Also update smart separators 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 67d3d1440543653f4338adba463bc2a7148d6711..c0bdf56cb5745db5d257cda2df63ca520a51d026 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Set cell data
+       unconditionally.  (#152562, Federico Mena Quintero)
+
 2004-10-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkuimanager.c (update_node): Also update smart separators 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 67d3d1440543653f4338adba463bc2a7148d6711..c0bdf56cb5745db5d257cda2df63ca520a51d026 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Set cell data
+       unconditionally.  (#152562, Federico Mena Quintero)
+
 2004-10-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkuimanager.c (update_node): Also update smart separators 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 8af6c6fea237c06d575cc57d025b793a9d668f20..19784432b28eb94168cb90f0c4acf55f018b56fc 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2286,16 +2286,15 @@ gtk_tree_view_button_press (GtkWidget      *widget,
          GtkTreePath *anchor;
          GtkTreeIter iter;
 
+         gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
+         gtk_tree_view_column_cell_set_cell_data (column,
+                                                  tree_view->priv->model,
+                                                  &iter,
+                                                  GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT),
+                                                  node->children?TRUE:FALSE);
+
          if (tree_view->priv->anchor)
-           {
-             anchor = gtk_tree_row_reference_get_path (tree_view->priv->anchor);
-             gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
-             gtk_tree_view_column_cell_set_cell_data (column,
-                                                      tree_view->priv->model,
-                                                      &iter,
-                                                      GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT),
-                                                      node->children?TRUE:FALSE);
-           }
+           anchor = gtk_tree_row_reference_get_path (tree_view->priv->anchor);
          else
            anchor = NULL;